diff --git a/pelicanconf.py b/pelicanconf.py
index e2b523b..2339f1a 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -13,10 +13,10 @@
 SITENAME = 'Giggi.me'
 
 # Custom variable, introduced for keeping requests cosistent
-INDEX_LINK_AS = 'blog.html'
+INDEX_LINK_URL = 'blog'
 
 # If set, stop treating index.html as default posts binder
-INDEX_SAVE_AS = INDEX_LINK_AS
+INDEX_SAVE_AS = INDEX_LINK_URL + '.html'
 
 # URL path to the root
 _SITEURL = os.getenv('PELICAN_SITEURL')
@@ -97,11 +97,11 @@
 
 # List of menu items
 MENUITEMS = [
-    ('Git', 'page/git.html'),
-    ('Mail', 'page/mail.html'),
-    ('Ftp', 'page/ftp.html'),
-    ('About', 'page/about.html'),
-    ('Invite', 'page/invite.html'),
+    ('Git', 'page/git'),
+    ('Mail', 'page/mail'),
+    ('Ftp', 'page/ftp'),
+    ('Invite', 'page/invite'),
+    ('About', 'page/about'),
 ]
 
 # Enable line numbers
@@ -122,71 +122,71 @@
 #RELATIVE_URLS = True
 
 # The URL to refer to an article.
-ARTICLE_URL = 'blog/{slug}.html'
+ARTICLE_URL = 'blog/{slug}'
 
 # The place where we will save an article.
 ARTICLE_SAVE_AS = 'blog/{slug}.html'
 
 # The URL to refer to an article which doesn’t use the default language.
-ARTICLE_LANG_URL = 'blog/{slug}-{lang}.html'
+ARTICLE_LANG_URL = 'blog/{slug}-{lang}'
 
 # The place where we will save an article which doesn’t use the default
 # language.
 ARTICLE_LANG_SAVE_AS = 'blog/{slug}-{lang}.html'
 
 # The URL to refer to an article draft.
-DRAFT_URL = 'draft/blog/{slug}.html'
+DRAFT_URL = 'blog/draft/{slug}'
 
 # The place where we will save an article draft.
-DRAFT_SAVE_AS = 'draft/blog/{slug}.html'
+DRAFT_SAVE_AS = 'blog/draft/{slug}.html'
 
 # The URL to refer to an article draft which doesn’t use the default language.
-DRAFT_LANG_URL = 'draft/blog/{slug}-{lang}.html'
+DRAFT_LANG_URL = 'blog/draft/{slug}-{lang}'
 
 # The place where we will save an article draft which doesn’t use the default
 # language.
-DRAFT_LANG_SAVE_AS = 'draft/blog/{slug}-{lang}.html'
+DRAFT_LANG_SAVE_AS = 'blog/draft/{slug}-{lang}.html'
 
 # The URL we will use to link to a page.
-PAGE_URL = 'page/{slug}.html'
+PAGE_URL = 'page/{slug}'
 
 # The location we will save the page. This value has to be the same as PAGE_URL
 # or you need to use a rewrite in your server config.
 PAGE_SAVE_AS = 'page/{slug}.html'
 
 # The URL we will use to link to a page which doesn’t use the default language.
-PAGE_LANG_URL = 'page/{slug}-{lang}.html'
+PAGE_LANG_URL = 'page/{slug}-{lang}'
 
 #The location we will save the page which doesn’t use the default language.
 PAGE_LANG_SAVE_AS = 'page/{slug}-{lang}.html'
 
 # The URL used to link to a page draft.
-DRAFT_PAGE_URL = 'draft/page/{slug}.html'
+DRAFT_PAGE_URL = 'page/draft/{slug}'
 
 # The actual location a page draft is saved at.
-DRAFT_PAGE_SAVE_AS = 'draft/page/{slug}.html'
+DRAFT_PAGE_SAVE_AS = 'page/draft/{slug}.html'
 
 # The URL used to link to a page draft which doesn’t use the default language.
-DRAFT_PAGE_LANG_URL = 'draft/page/{slug}-{lang}.html'
+DRAFT_PAGE_LANG_URL = 'page/draft/{slug}-{lang}'
 
 # The actual location a page draft which doesn’t use the default language is
 # saved at.
 DRAFT_PAGE_LANG_SAVE_AS = 'draft/page/{slug}-{lang}.html'
 
 # The URL to use for a category.
-CATEGORY_URL = 'category/{slug}.html'
+CATEGORY_URL = 'category/{slug}'
 
 # The location to save a category.
 CATEGORY_SAVE_AS = 'category/{slug}.html'
 
 # The URL to use for a tag.
-TAG_URL = 'tag/{slug}.html'
+TAG_URL = 'tag/{slug}'
 
 # The location to save the tag page.
 TAG_SAVE_AS = 'tag/{slug}.html'
 
 # The URL to use for an author.
-AUTHOR_URL = 'author/{slug}.html'
+AUTHOR_URL = 'author/{slug}'
 
 # The location to save an author.
 AUTHOR_SAVE_AS = 'author/{slug}.html'